fix(doctest): Include all search paths with new build layout by epage · Pull Request #16348 · rust-lang/cargo

epage · 2025-12-05T17:20:50Z

What does this PR try to resolve?

When compilation was updated for the new build layout, doctests were overlooked. This extracts the search path (-L) creation and switches doctests to reuse it.

Part of #15010

How to test and review this PR?

Part of rust-lang#15010

rustbot · 2025-12-05T17:20:55Z

r? @ehuss

rustbot has assigned @ehuss.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

epage · 2025-12-05T19:22:32Z

 ---- cache_lock::shared_then_download stdout ----

thread 'cache_lock::shared_then_download' (4884) panicked at tests\testsuite\cache_lock.rs:15:5:
test did not finish within 10 attempts (1.0034649s total)


failures:
    cache_lock::shared_then_download

test result: FAILED. 3566 passed; 1 failed; 367 ignored; 0 measured; 0 filtered out; finished in 746.10s

rustbot · 2025-12-05T22:06:31Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

weihanglo

Feel free to merge by youself with or without addrresing nits.

View changes since this review

weihanglo · 2025-12-05T23:49:17Z

tests/testsuite/test.rs

+        .file("b/src/lib.rs", "pub fn bar() {}")
+        .build();
+
+    p.cargo("test -v").run();


nit: -v verbose is not needed perhaps?

The test I modeled it after did it and it helped as I debugged it. We aren't needing to test output so it doesn't make testing any more difficult.

Update cargo submodule 27 commits in 2c283a9a5c5968eeb9a8f12313f04feb1ff8dfac..c46423de7351e3c4c734b2faa86088a9f5d1302b 2025-12-04 16:47:28 +0000 to 2025-12-12 23:16:12 +0000 - feat(report): cargo report timings HTML replay (rust-lang/cargo#16377) - feat: stabilize `-Zconfig-include` (rust-lang/cargo#16284) - fix(package): Don't verify registry for --list (rust-lang/cargo#16341) - Fixed incorrect locking logic when artifact-dir == build-dir (rust-lang/cargo#16385) - feat(log): make timing messages ready for HTML replay (rust-lang/cargo#16382) - chore(deps): update msrv (1 version) to v1.92 (rust-lang/cargo#16381) - Downgrade curl-sys to 0.4.83 (rust-lang/cargo#16379) - fix(timing): more self-contained timing/log data (rust-lang/cargo#16378) - test: update to `proc_macro::tracked::path` (rust-lang/cargo#16380) - refactor(lint): move lints to separate modules (rust-lang/cargo#16364) - fix(index): Apply feedback from Cargo team (rust-lang/cargo#16369) - fix(lints): handle lints separately at ws pkg level (rust-lang/cargo#16367) - feat(lint): new `implicit_minimum_version_req` lint (rust-lang/cargo#16321) - fix(info): default to local without explicit reg (rust-lang/cargo#16358) - Remove `[no-mentions]` handler in our triagebot config (rust-lang/cargo#16361) - Don't read the config file twice when $CARGO_HOME is a symlink (rust-lang/cargo#16325) - fix(timings): forgot to negate filter (rust-lang/cargo#16352) - fix(doctest): Include all search paths with new build layout (rust-lang/cargo#16348) - fix(layout): Remove hashes from bins in new layout (rust-lang/cargo#16351) - docs(faq): Include an entry on disk space (rust-lang/cargo#16349) - feat(timings): derive concurrency data from unit data (rust-lang/cargo#16350) - perf(layout): Use unit_id, not pkg hash, for bin/lib pkg_dirs for new layout (rust-lang/cargo#16345) - Validate target source paths before compilation with clearer errors (rust-lang/cargo#16338) - test(doc): Remove unused build script (rust-lang/cargo#16344) - refactor(timings): store UnitData in RenderContext instead (rust-lang/cargo#16346) - perf(clean): Optimize (legacy) clean with multiple -p specifiers (rust-lang/cargo#16264) - test: Adjust output for out-of-tree build-dir (rust-lang/cargo#16343)

Update cargo submodule 29 commits in 2c283a9a5c5968eeb9a8f12313f04feb1ff8dfac..e91b2baa632c0c7e84216c91ecfe107c37d887c1 2025-12-04 16:47:28 +0000 to 2025-12-13 16:29:21 +0000 - refactor(lints): move from cargo::util::lints to cargo::lints (rust-lang/cargo#16392) - test(lint): redact more due to line got omitted (rust-lang/cargo#16391) - feat(report): cargo report timings HTML replay (rust-lang/cargo#16377) - feat: stabilize `-Zconfig-include` (rust-lang/cargo#16284) - fix(package): Don't verify registry for --list (rust-lang/cargo#16341) - Fixed incorrect locking logic when artifact-dir == build-dir (rust-lang/cargo#16385) - feat(log): make timing messages ready for HTML replay (rust-lang/cargo#16382) - chore(deps): update msrv (1 version) to v1.92 (rust-lang/cargo#16381) - Downgrade curl-sys to 0.4.83 (rust-lang/cargo#16379) - fix(timing): more self-contained timing/log data (rust-lang/cargo#16378) - test: update to `proc_macro::tracked::path` (rust-lang/cargo#16380) - refactor(lint): move lints to separate modules (rust-lang/cargo#16364) - fix(index): Apply feedback from Cargo team (rust-lang/cargo#16369) - fix(lints): handle lints separately at ws pkg level (rust-lang/cargo#16367) - feat(lint): new `implicit_minimum_version_req` lint (rust-lang/cargo#16321) - fix(info): default to local without explicit reg (rust-lang/cargo#16358) - Remove `[no-mentions]` handler in our triagebot config (rust-lang/cargo#16361) - Don't read the config file twice when $CARGO_HOME is a symlink (rust-lang/cargo#16325) - fix(timings): forgot to negate filter (rust-lang/cargo#16352) - fix(doctest): Include all search paths with new build layout (rust-lang/cargo#16348) - fix(layout): Remove hashes from bins in new layout (rust-lang/cargo#16351) - docs(faq): Include an entry on disk space (rust-lang/cargo#16349) - feat(timings): derive concurrency data from unit data (rust-lang/cargo#16350) - perf(layout): Use unit_id, not pkg hash, for bin/lib pkg_dirs for new layout (rust-lang/cargo#16345) - Validate target source paths before compilation with clearer errors (rust-lang/cargo#16338) - test(doc): Remove unused build script (rust-lang/cargo#16344) - refactor(timings): store UnitData in RenderContext instead (rust-lang/cargo#16346) - perf(clean): Optimize (legacy) clean with multiple -p specifiers (rust-lang/cargo#16264) - test: Adjust output for out-of-tree build-dir (rust-lang/cargo#16343)

epage added 6 commits December 5, 2025 10:53

test(doctest): Verify tested lib deps work

6eca6ea

test(doctest): Copy a doctest in prep for new layout

25d2974

test(doctest): Show doctests with new-layout

c185261

refactor(compile): Separate search path creation from command init

db488ca

refactor(compile): Pull out search path creation

0e8fefa

fix(doctest): Include all search paths with new build layout

d88e51d

Part of rust-lang#15010

rustbot assigned ehuss Dec 5, 2025

rustbot added A-build-execution Area: anything dealing with executing the compiler Command-test S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 5, 2025

epage mentioned this pull request Dec 5, 2025

perf(layout): Use unit_id, not pkg hash, for bin/lib pkg_dirs for new layout #16345

Merged

epage mentioned this pull request Dec 5, 2025

Added CARGO_BUILD_DIR_LAYOUT_V2 env var to opt in/out of new layout #16336

Open

epage force-pushed the doctest branch from 7c58da6 to d88e51d Compare December 5, 2025 22:06

weihanglo approved these changes Dec 5, 2025

View reviewed changes

epage added this pull request to the merge queue Dec 6, 2025

Merged via the queue into rust-lang:master with commit 977254c Dec 6, 2025
28 checks passed

epage deleted the doctest branch December 6, 2025 00:42

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 6, 2025

weihanglo mentioned this pull request Dec 12, 2025

Update cargo submodule rust-lang/rust#149934

Merged

rustbot added this to the 1.94.0 milestone Dec 13, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(doctest): Include all search paths with new build layout #16348

fix(doctest): Include all search paths with new build layout #16348
epage merged 6 commits intorust-lang:masterfrom
epage:doctest

epage commented Dec 5, 2025

Uh oh!

rustbot commented Dec 5, 2025

Uh oh!

epage commented Dec 5, 2025

Uh oh!

rustbot commented Dec 5, 2025

Uh oh!

weihanglo left a comment •

edited by rustbot

Loading

Uh oh!

weihanglo Dec 5, 2025

Uh oh!

epage Dec 6, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

epage commented Dec 5, 2025

What does this PR try to resolve?

How to test and review this PR?

Uh oh!

rustbot commented Dec 5, 2025

Uh oh!

epage commented Dec 5, 2025

Uh oh!

rustbot commented Dec 5, 2025

Uh oh!

weihanglo left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

weihanglo Dec 5, 2025

Choose a reason for hiding this comment

Uh oh!

epage Dec 6, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

weihanglo left a comment •

edited by rustbot

Loading